Merge git://git.denx.de/u-boot-rockchip
authorTom Rini <[email protected]>
Wed, 1 Nov 2017 13:32:14 +0000 (09:32 -0400)
committerTom Rini <[email protected]>
Wed, 1 Nov 2017 13:32:14 +0000 (09:32 -0400)

Trivial merge